Skip to content

Wrap --base callouts in start skill in BRANCH_DEV conditional#75

Merged
sebastientaggart merged 1 commit into
devfrom
feature/start-base-callout-conditional
Apr 8, 2026
Merged

Wrap --base callouts in start skill in BRANCH_DEV conditional#75
sebastientaggart merged 1 commit into
devfrom
feature/start-base-callout-conditional

Conversation

@sebastientaggart

@sebastientaggart sebastientaggart commented Apr 8, 2026

Copy link
Copy Markdown
Member

The Case A Step 4 and Case B Step 3 callout paragraphs in skills/start.md sat outside the {{#if BRANCH_DEV}} block that wraps the gh issue develop code fences above them. On trunk-based projects (where BRANCH_DEV is unset) this caused two problems:

  1. The compiled adapter output leaked a literal {{BRANCH_DEV}} token into the rendered callout — flagged downstream as a CRITICAL template bug.
  2. The callout itself is irrelevant in a trunk workflow (there is no alternate base branch), so it should not render at all.

This PR wraps both callouts in {{#if BRANCH_DEV}} … {{/if}} and tightens the wording by dropping the now-redundant "when BRANCH_DEV is set" clause. All four adapter files (.claude, .cursor, .agents, .gemini) were regenerated via ./sync.sh.

Test plan

  • make check passes (sync validation clean)
  • In this repo (BRANCH_DEV=dev), compiled .claude/commands/start.md still renders the callout with git checkout dev
  • On a trunk-based downstream project, re-running /setup (or bumping the submodule) should remove the literal {{BRANCH_DEV}} from the compiled start skill entirely

Closes #74

The Case A Step 4 and Case B Step 3 callout paragraphs sat outside the
{{#if BRANCH_DEV}} block wrapping the gh issue develop code fences, so
on trunk-based projects the compiled output leaked a literal
{{BRANCH_DEV}} token and rendered a callout irrelevant to that workflow.
Wrap both callouts in the same conditional and drop the now-redundant
'when BRANCH_DEV is set' clause.

Closes #74
@sebastientaggart

Copy link
Copy Markdown
Member Author

Review Summary

Verdict: APPROVE

Findings

No issues found. Code looks correct and follows project conventions. The two --base is required callouts in skills/start.md are now correctly wrapped in {{#if BRANCH_DEV}}, preventing the literal {{BRANCH_DEV}} token from leaking through on trunk-based downstream projects, and the four adapter files (.agents, .claude, .cursor, .gemini) are consistently regenerated with the post-substitution wording.

@sebastientaggart
sebastientaggart merged commit 88b5268 into dev Apr 8, 2026
2 checks passed
@sebastientaggart
sebastientaggart deleted the feature/start-base-callout-conditional branch April 8, 2026 17:59
@sebastientaggart sebastientaggart mentioned this pull request Apr 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant